Try to find libpng via pkg-config first, since libpng-1.2.2 will come with

	* configure.in: Try to find libpng via pkg-config first,
	since libpng-1.2.2 will come with a .pc file.

diff --git a/ChangeLog b/ChangeLog
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3084c0c6a8153e75616a1387a342bdd3ad7c45b9..6173f58f99160ba4e487bc3e6b5c5e6485dce993 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-03-27  Matthias Clasen  <maclas@gmx.de>
+
+       * configure.in: Try to find libpng via pkg-config first,
+       since libpng-1.2.2 will come with a .pc file.
+
 Wed Mar 27 11:10:39 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (gtk_notebook_real_remove): Set

diff --git a/configure.in b/configure.in
index 6af38c1c4a2fb3dfbddda5e0c69bf48a44f3e733..db2c09f26c32664d5663948e0ad4853c920d2c25 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -697,25 +697,34 @@ dnl Test for libjpeg
 
 dnl Test for libpng
   if test x$with_libpng != xno && test -z "$LIBPNG"; then
-    AC_CHECK_LIB(png, png_read_info,
-      [AC_CHECK_HEADER(png.h,
-        png_ok=yes,
-        png_ok=no)],
-      AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-    if test "$png_ok" = yes; then
-      AC_MSG_CHECKING([for png_structp in png.h])
-      AC_TRY_COMPILE([#include <png.h>],
-        [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
-        png_ok=yes,
-        png_ok=no)
-      AC_MSG_RESULT($png_ok)
+    AC_MSG_CHECKING(for libpng12)
+    if $PKG_CONFIG --exists libpng12 ; then
+        AC_MSG_RESULT(yes)
+        PNG='png'
+       PNG_DEP_CFLAGS_PACKAGES=libpng12
+       LIBPNG=`$PKG_CONFIG --libs libpng12`
+    else
+      AC_MSG_RESULT(no)
+      AC_CHECK_LIB(png, png_read_info,
+        [AC_CHECK_HEADER(png.h,
+          png_ok=yes,
+          png_ok=no)],
+        AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
       if test "$png_ok" = yes; then
-        PNG='png'; LIBPNG='-lpng -lz'
+        AC_MSG_CHECKING([for png_structp in png.h])
+        AC_TRY_COMPILE([#include <png.h>],
+          [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
+          png_ok=yes,
+          png_ok=no)
+        AC_MSG_RESULT($png_ok)
+        if test "$png_ok" = yes; then
+          PNG='png'; LIBPNG='-lpng -lz'
+        else
+          AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
+        fi
       else
-        AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
+       AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
       fi
-    else
-     AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
     fi
   fi
 
@@ -846,7 +855,7 @@ GDK_PIXBUF_PACKAGES="gmodule-2.0 gobject-2.0"
 GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB"
 GDK_PIXBUF_EXTRA_CFLAGS= 
 GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
 
 AC_SUBST(GDK_PIXBUF_PACKAGES)
 AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)